Review methods in new classes, also tests