Defer remaining tests, will update soon
Move remaining tests to appropriately named test files