moved some tests