Moved some tests to Functional