Fixing some simple errors that were blocking the tests from running smoothly.