Woops, remove the outdated "test" stuff.