Fix exports, increase coverage