Improve test coverage of sbws