Minor clean up and test cleanup (there was some GIT conflict text in the comments)