Enhancing usage, better testing
Updating tests, adding several more