Some more complex unit tests added and passing