Renamed tests, added ui-tests group, fixed some remarks