Added interface builder and unit tests for it