Cleanup

Cleanup data initialization and tests