move tests to new solution