Cleaned up unneeded things in tests