Under construction: Moved some tests.