Fixed executor test and some more cleanup