Moved custom test handler to a different file