Got tests running (finally)