removed context type parameter, more tests