Remove permissive support; stub is now specific to behaviours
Rewrite expectation parsing/handling
Move tests to correct unit, remove redundant tests