More tests

moved some code to Productivity Extensions