diff --git a/python/__init__.py b/python/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/python/gilded_rose.py b/python/tests/gilded_rose.py
old mode 100755
new mode 100644
similarity index 100%
rename from python/gilded_rose.py
rename to python/tests/gilded_rose.py
diff --git a/python/tests/test_gilded_rose.py b/python/tests/test_gilded_rose.py
index 1c92f638..26d1fd24 100644
--- a/python/tests/test_gilded_rose.py
+++ b/python/tests/test_gilded_rose.py
@@ -5,12 +5,22 @@ from gilded_rose import Item, GildedRose
 
 
 class GildedRoseTest(unittest.TestCase):
-    def test_foo(self):
+
+    def check_item_values(self, item, name, sell_in, quality):
+        self.assertEqual(item.name, name)
+        self.assertEqual(item.sell_in, sell_in)
+        self.assertEqual(item.quality, quality)
+
+    def test_foo_nonnegative(self):
         items = [Item("foo", 0, 0)]
         gilded_rose = GildedRose(items)
         gilded_rose.update_quality()
-        self.assertEqual("fixme", items[0].name)
+        self.assertEqual("foo", items[0].name)
+        self.assertEqual(0, items[0].sell_in)
+        self.assertEqual(0, items[0].quality)
 
+    def test_multiple_items(self):
+        items = [Item("foo", 0, 0), Item("bar", 0, 0)]
         
 if __name__ == '__main__':
     unittest.main()
diff --git a/python/texttest_fixture.py b/python/texttest_fixture.py
index 8f7e4940..3b83658c 100644
--- a/python/texttest_fixture.py
+++ b/python/texttest_fixture.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
-from gilded_rose import *
+from python.tests.gilded_rose import *
 
 
 def main():