More tests (caught a bug), updated readmes.