improve spec and cuke performance