Re-added tests that didn't work originally