Cleaned up these tests more; still work needed