#274 refactor: move new tests into new class and add static method test