Added new Controller Level Unit Tests into the mix