Make sure we refacactor lib and tests for now.