Added test for multiples of 3 or 5
Refactored and removed legacy tests and methods