Added more JUnits