Committing some Tests and updated PHNXEngine