final class fixes for failed tests