Updated tests, added timeout

Updated some tests, added an error timeout to stop hanging tests.