added more tests
changed building constructor