First version working for all use tests.