Clean Commented code
Add Strict Key tests