Small simplifications & cleanups
Add anither testcase