WIP added some args, finished some tests, currently working on (broken) test_not_cached