Updated tests/specs and codebehind