Organizes tests
Updates README