Update #38 work around while no solution is found
Update controller tests
Fix #30
Fix #39
Clean up tests
Update project