dome fix's and unit tests included