restructured tests and updated the readme