Debugged and collated junit tests