Fixing FC007 error and test clean up