Reduce sloc, add two test