Move base tests to separate file