Update unit tests. Definitely not at 100% any more