Expand tests to other bases