Updated tests structure
Updated README.md