Removed `mapconcat` reference from `build-simple-endpoint`
Cleaned up test driver code