Testing some more

CBCJ-37