make until return consistent type
ignore pycharm
standalone test runner
moved test runner