Test cleanup, coverage improved on unit tests