Simplified some test classes.
Updated readme.