adjusted classes and tests for a couple commits in falcon.jx