Get test coverage up to 100%
Remove unused testing code.