Added custom tests