Replaced '' for '.
Corrected Controller tests.
Increased Testcoverage for Services.