simplified tests
cleanup
Fixed array conversion issues