Fixed bug on tests ending with 's'

Added comments, improved readability