test changed to scrypto, some cleaning