fix and tests for oneliners;