Added cucumber test files + code improvements on plugins