Cleaning up some warnings / errors on testing