Filling out library
Breaking down test suite