Added new test classes and new test cases. Found and corrected a bug, so I guess we can consider this the first real version of the system.