Making all tests work
Added more verbose info and more tests on the new features