Working on getting tests to run