Test improvements with abstract class