Implemented tests
Updated tests