Updated unit tests (unable to get security working)