Making tests passed