Cleaned up aardvark tests.
Impoved spies in routerSpec and fixed indention in router