added offical tests
remove swap