hmm, somehow was missing from the commit
quick refactoring
test forwarding
attach each test to a separate label