Bringing in tests, moving files to lib