A bit of code formatting and addition of extra tests for BMV