replaced deprecated sameas by same as in tests
replaced deprecated divisibleby by divisible by in tests