Improving tests. Project to practise. It's unfinished.