cleanup + JUnits