Finished up custom engine tests