Make test properties more modular