pyxform merge

updated tests for new pyxform with xlsx, instanceid and new cascading select support.