move tests into same class as method under test