Updates tests
Fixes keyword parsing