Assertj security tests

this one at the moment conflicts with #521. I will rebase mine on this one