Improved tests.
Fixed small issue checking the wrong array.
Fixed keywords.