add some wrapper methods and tests for it
re-enable original tests