Tests fixed, passing