Add Aqua
and test_reuse_encoder
tests
#92
Merged
Aqua
and test_reuse_encoder
tests
#92