Fixing up the test things a bit, not much better but okay, need to learn me some grunt