Cleaned up Tests