Cleaned testing code