added tests, remove Hy's tests