Fix Failing Tests

Ha! Maybe you should make this 2020 or something?