Merge "Move comptue base test to common dir"