Remove sample test. Resolve #101.
Resolve merge conflict.