Fixed dictionary proxy
Added basic tests for main, basket & view model