Updated tests, fixed bugs, added README