Switch back to BitType for testing

While at it fix a couple minor bugs