Enhance unit tests (accept brin J-7 at 0:0:0:0:0:0:0)