Fix before\simple & add more code coverage