started adding alexey's specs, fixed existing tests accordingly
fixed merge conflicts