Remove debugging, expand test coverage