Made minor fixes, updated related tests