Fixing wrong conditions, updating test