#21 : Unit tests didn't make it in original commit.