Clean up junit tests