Use dev flag.
Restructured tests.