Tidy up test boilerplate

[Krijger]

The test are becoming a bit much. See if usage of the https://docs.gradle.org/current/userguide/test_kit.html can make the code cleaner and hopefully execute faster as well