Move tests out of src and into test
Implement timeout (resolves #364)
Merge pull request #367 from Arcterus/src-to-test

Move tests out of src and into test
Merge pull request #368 from Arcterus/timeout

Implement timeout