Fixed some unit tests, added to coverage