Add tests for janExpressions
Remove genericExpression tests and fix dependencies