Fixed tests and broke out user to own controller in js