Castle updates and tests

Castle updated to version 3.2 and tests on Issue #49 added.