added Expansive
fixed more tests.