Add unit tests for executor