Reorganized test structure.
Added some tests to better picker.