Changed some constructors to conversions.
Reorganized tests.