duplication in the tests removed
format improved