Cleaned up testing features