Reworked some tests. Still working through them