Further behaviour testing

Continuation of previous work