Initial commit
minor tests improvement