Adding concurrent

Also removing some of the tests that no longer work
Updating test information