#29 Didn't change the implementation in test.
#5 A bit more testing