Test now tests oneliners, all tests pass. Not sure if everything is working correctly though
merge