need better test-logic