Modified Tests so they can run via repl