Fixing up testing so it works.