Moved testing to a separate test file from main