Minor cleanup and fixes to get dummy test to run successfully