Tests finished. Added single mode