Fixed the sbs test to start refactoring.