Moved builder tests to separate file