Moved tests in preparation for functional tests