Cleaning a little test3 implementation