Remove old testing code
Merge
More type conversion and enforcement