Fixed minor testing issues. Nothing site-breaking. All tests now pass