simplify method names
bugfix due to semicolons
add basic tests