Fixed the tests by adding proper declarations at the top.
more cleanup
fix unicorn