Added the ability to specify custom tests