Added mbr module tests
Fixed lint warnings