some cleanup to make tests work
unit tests for core objects