Update tests. All passing :)