Implemented more of these unit tests