Fixing some UI testing stuff, adding basic controller tests