Reverted test code. Added TODO.