Cleaned up tests
Added more tests
Added more tests
Updated Changes [ci skip]