Major changes on unit testing + adding test for TeamWorkController