Adds test for #12 and re-enables cpp tests