More tests. Started working on switcher.
Update tests for decoupling