updates to pass tests