Add new libs. Re-organize tests.