Fixed tests and stripped /new