revising most of the tests for bs3