Fixing up tests (one is currently failing, but that's b/c it's poorly written)