MEDIUM / Fixed casts
MEDIUM / Refactor FGE / JUnit tests