Moved to list based routes.
Test stubs and part of tests.