Modified mapped bits to start at 0 instead of 1
Changed tests to account for bit values starting at 0