Implemented some tests
Added new tests