[lib, test] moving stuff around