Added timeouts to MarkTest