added tests and fixed 'Single'