Add tests for all the past/current sbws issues