chore(*): Test & violation fixes