Finalized version for using Unity, changed some parameters in test code