move code that doesn't depend on internals to own file, add tests

move code that doesn't depend on internals to own file, add tests #45