More testing and cleaning up