Updated tests
Added more updates
Completed testing