Now passes tests from command line and in IntelliJ (if bundle prebuilt)