Lots more unit tests. Slowly working way through