Build & deployment improvements

Add additional unit tests