put dependencies in appropriate groups and speed up tests