Removed .only and fixed tests