cleaned up tests at the cost of add an  method