Ascii: Adding more tests & refactoring