Removed validators, reorganized unit tests