Added all remaining tests, including controllers