Increasing test coverage and fixing bugs found while writing tests

This comment is out of date. Also, don't we want to choose the power of two that is great than the number of features as to avoid collisions?