fixed tests as far as xForakk