Rearrange basic test, add threading tests

Threading tests currently failing...