Commented out extended tests to save time