Update tests to actually pass