Added support for multiple custom command and assertion folders - #255