fix to behave like the offical tester + more test