added more customisations for tests