Updated tests, used nesting cuke tests