all comments and test hooks removed. Code ready for pushing upstream :)