Fixing tests part 1
test coverage dramatically improved