Fixed Unit test that ensured word casing is preserverd + Layed foundation for optimised Composer