handle tests
more logical way