Added additional tests and experimenting with parrallelization