Fixed broken tests. This Java datatype stuff is concerning me for this project