Make test properties more modular
Update build expression