Reversing controller changes and updating test