WIP
remove test hackery; separate internals module
fixes
rename
docs