Fix a couple failing tests

Fixed the first two failing tests