Reverted tests to original