Removed tests and added timeout