some tests added
asd
Merge branch 'sio'