Adding -a option for tests