Everything now passes tests