Expand building test and create building object