Fixing up testing