Enhancing tests using more amrita's features