fix keyContent not being passed & added tests