Tests pass! Finally!