Fix exports, add separate tests