Update solution and tests