cleanup and tests
added (e)dismax with alt_parser