Fix some issues. Add jUnit rule for soft validations, more unit tests