updated test for the transformer
updated main class and transformer
fixed conflicts