Moved the source and around and got the code coverage working