Slightly optimise the tests and try own assrt library