Resolve more build errors.  This should build completely.
Move test file to match new naming conventions