getting tests to run and making some minor changes