BISERVER-11122 @Overrides added, added lost unit tests