More tests.
Fixed merge conflicts between Dmitry's Fork & Whitney's