Update Tests

Tests have been updated. Please see commit notes.