Moved Tests out