Topic/cleanup

Fix unit tests
Make config files static
Add configs for 2011, 2012