Added more tests
Added more tests
Added visual controls