add new def-system tests and change other