Changed params to Map<String, Object> and other cleanup
Fixed error with TestEngine