Add context initializer, fix some specs