added more checks in specs