More work on mandatory property tests