Improved model test according to findbugs