Fixed failing tests. Still 3 failing.