Moved test code out of root and into a test folder