Begin refactoring unit tests. Dont override build number if its already been set