!U add new test, other minor changes WIP