Move builder tests to builders dir