Cleaned tests