Added a couple more spec tests around sub product
Fix checkstyle