Remove underscore and fix class name. Doh.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Add new test.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>