Added back other tests and removed dev statements