Changes made to pass tests