diff --git a/src/flow.ts b/src/flow.ts
index 390d1199c0..6977a7f735 100644
--- a/src/flow.ts
+++ b/src/flow.ts
@@ -214,6 +214,13 @@ export const Flow = {
     return Tables.MUSIC_FONT_STACK.slice();
   },
 
+  /**
+   * @returns the `Font` object at the head of the music font stack.
+   */
+  currentMusicFont(): Font {
+    return Tables.currentMusicFont();
+  },
+
   get NOTATION_FONT_SCALE(): number {
     return Tables.NOTATION_FONT_SCALE;
   },
diff --git a/tests/accidental_tests.ts b/tests/accidental_tests.ts
index cd43b3c29b..6ebe1b60e6 100644
--- a/tests/accidental_tests.ts
+++ b/tests/accidental_tests.ts
@@ -5,22 +5,22 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Accidental } from 'accidental';
-import { Beam } from 'beam';
-import { Factory } from 'factory';
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { Modifier } from 'modifier';
-import { ModifierContext } from 'modifiercontext';
-import { Note } from 'note';
-import { RenderContext } from 'rendercontext';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { Stem } from 'stem';
-import { TickContext } from 'tickcontext';
-import { TimeSigNote } from 'timesignote';
-import { isCategory } from 'typeguard';
-import { Voice } from 'voice';
+import { Accidental } from '../src/accidental';
+import { Beam } from '../src/beam';
+import { Factory } from '../src/factory';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { Modifier } from '../src/modifier';
+import { ModifierContext } from '../src/modifiercontext';
+import { Note } from '../src/note';
+import { RenderContext } from '../src/rendercontext';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { Stem } from '../src/stem';
+import { TickContext } from '../src/tickcontext';
+import { TimeSigNote } from '../src/timesignote';
+import { isCategory } from '../src/typeguard';
+import { Voice } from '../src/voice';
 
 const AccidentalTests = {
   Start(): void {
diff --git a/tests/annotation_tests.ts b/tests/annotation_tests.ts
index 1ede134987..8e8198828d 100644
--- a/tests/annotation_tests.ts
+++ b/tests/annotation_tests.ts
@@ -9,21 +9,20 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Annotation } from 'annotation';
-import { Beam } from 'beam';
-import { Bend } from 'bend';
-import { Flow } from 'flow';
-// import { Font } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { Registry } from 'registry';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { Tickable } from 'tickable';
-import { Vibrato } from 'vibrato';
-import { Voice } from 'voice';
+import { Annotation } from '../src/annotation';
+import { Beam } from '../src/beam';
+import { Bend } from '../src/bend';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { Registry } from '../src/registry';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { Tickable } from '../src/tickable';
+import { Vibrato } from '../src/vibrato';
+import { Voice } from '../src/voice';
 
 const AnnotationTests = {
   Start(): void {
diff --git a/tests/articulation_tests.ts b/tests/articulation_tests.ts
index 83a927bb78..08f836ce40 100644
--- a/tests/articulation_tests.ts
+++ b/tests/articulation_tests.ts
@@ -5,18 +5,18 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Articulation } from 'articulation';
-import { Beam } from 'beam';
-import { Flow } from 'flow';
-// import { Font } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { Barline } from 'stavebarline';
-import { StaveNote } from 'stavenote';
-import { TabNote } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { Voice } from 'voice';
+import { Articulation } from '../src/articulation';
+import { Beam } from '../src/beam';
+import { Flow } from '../src/flow';
+import { Font } from '../src/font';
+import { Formatter } from '../src/formatter';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { Barline } from '../src/stavebarline';
+import { StaveNote } from '../src/stavenote';
+import { TabNote } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { Voice } from '../src/voice';
 
 const ArticulationTests = {
   Start(): void {
@@ -306,8 +306,7 @@ function drawArticulations2(options: TestOptions): void {
 
 function tabNotes(options: TestOptions, contextBuilder: ContextBuilder): void {
   const ctx = contextBuilder(options.elementId, 600, 200);
-  ctx.font = '10pt Arial';
-  // ctx.font = '10pt ' + Font.SANS_SERIF; // RONYEH
+  ctx.font = '10pt ' + Font.SANS_SERIF;
   const stave = new TabStave(10, 10, 550);
   stave.setContext(ctx);
   stave.draw();
diff --git a/tests/auto_beam_formatting_tests.ts b/tests/auto_beam_formatting_tests.ts
index ba0e23e2be..325b2a4053 100644
--- a/tests/auto_beam_formatting_tests.ts
+++ b/tests/auto_beam_formatting_tests.ts
@@ -8,11 +8,11 @@
 
 import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { EasyScore } from 'easyscore';
-import { Fraction } from 'fraction';
-import { Stem } from 'stem';
-import { StemmableNote } from 'stemmablenote';
+import { Beam } from '../src/beam';
+import { EasyScore } from '../src/easyscore';
+import { Fraction } from '../src/fraction';
+import { Stem } from '../src/stem';
+import { StemmableNote } from '../src/stemmablenote';
 
 const AutoBeamFormattingTests = {
   Start(): void {
diff --git a/tests/bach_tests.ts b/tests/bach_tests.ts
index 6c7bb68ef6..a2240b5d41 100644
--- a/tests/bach_tests.ts
+++ b/tests/bach_tests.ts
@@ -5,10 +5,10 @@
 
 import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Factory } from 'factory';
-import { Registry } from 'registry';
-import { BarlineType } from 'stavebarline';
-import { StaveNote } from 'stavenote';
+import { Factory } from '../src/factory';
+import { Registry } from '../src/registry';
+import { BarlineType } from '../src/stavebarline';
+import { StaveNote } from '../src/stavenote';
 
 const BachDemoTests = {
   Start(): void {
diff --git a/tests/barline_tests.ts b/tests/barline_tests.ts
index 59998ac7ca..f3e2cb474d 100644
--- a/tests/barline_tests.ts
+++ b/tests/barline_tests.ts
@@ -5,7 +5,7 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Barline, BarlineType } from 'stavebarline';
+import { Barline, BarlineType } from '../src/stavebarline';
 
 const BarlineTests = {
   Start(): void {
diff --git a/tests/beam_tests.ts b/tests/beam_tests.ts
index 6d7cf60d21..a9039fc3b7 100644
--- a/tests/beam_tests.ts
+++ b/tests/beam_tests.ts
@@ -7,12 +7,12 @@
 
 import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { StaveNoteStruct } from 'stavenote';
-import { Stem } from 'stem';
-import { StemmableNote } from 'stemmablenote';
-import { TabNoteStruct } from 'tabnote';
-import { Voice } from 'voice';
+import { Beam } from '../src/beam';
+import { StaveNoteStruct } from '../src/stavenote';
+import { Stem } from '../src/stem';
+import { StemmableNote } from '../src/stemmablenote';
+import { TabNoteStruct } from '../src/tabnote';
+import { Voice } from '../src/voice';
 
 const BeamTests = {
   Start(): void {
diff --git a/tests/bend_tests.ts b/tests/bend_tests.ts
index 73703f9189..99f8c3d83b 100644
--- a/tests/bend_tests.ts
+++ b/tests/bend_tests.ts
@@ -5,15 +5,14 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Bend, BendPhrase } from 'bend';
-// import { Font } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { ModifierContext } from 'modifiercontext';
-import { Note } from 'note';
-import { ContextBuilder } from 'renderer';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { TickContext } from 'tickcontext';
+import { Bend, BendPhrase } from '../src/bend';
+import { Formatter } from '../src/formatter';
+import { ModifierContext } from '../src/modifiercontext';
+import { Note } from '../src/note';
+import { ContextBuilder } from '../src/renderer';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { TickContext } from '../src/tickcontext';
 
 const BendTests = {
   Start(): void {
diff --git a/tests/boundingbox_tests.ts b/tests/boundingbox_tests.ts
index 7f83803e44..d3e54cb725 100644
--- a/tests/boundingbox_tests.ts
+++ b/tests/boundingbox_tests.ts
@@ -3,7 +3,7 @@
 //
 // Bounding Box Tests
 
-import { BoundingBox } from 'boundingbox';
+import { BoundingBox } from '../src/boundingbox';
 
 const BoundingBoxTests = {
   Start(): void {
diff --git a/tests/boundingboxcomputation_tests.ts b/tests/boundingboxcomputation_tests.ts
index 14ddf25a88..5c6271948f 100644
--- a/tests/boundingboxcomputation_tests.ts
+++ b/tests/boundingboxcomputation_tests.ts
@@ -5,9 +5,9 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { BoundingBoxComputation } from 'boundingboxcomputation';
-import { Glyph, OutlineCode } from 'glyph';
-import { RenderContext } from 'rendercontext';
+import { BoundingBoxComputation } from '../src/boundingboxcomputation';
+import { Glyph, OutlineCode } from '../src/glyph';
+import { RenderContext } from '../src/rendercontext';
 
 const BoundingBoxComputationTests = {
   Start(): void {
diff --git a/tests/chordsymbol_tests.ts b/tests/chordsymbol_tests.ts
index 7ef26c988a..5d2f7fb00b 100644
--- a/tests/chordsymbol_tests.ts
+++ b/tests/chordsymbol_tests.ts
@@ -5,12 +5,12 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Accidental } from 'accidental';
-import { ChordSymbol } from 'chordsymbol';
-import { Factory } from 'factory';
-import { Formatter } from 'formatter';
-import { Stave } from 'stave';
-import { StaveNote } from 'stavenote';
+import { Accidental } from '../src/accidental';
+import { ChordSymbol } from '../src/chordsymbol';
+import { Factory } from '../src/factory';
+import { Formatter } from '../src/formatter';
+import { Stave } from '../src/stave';
+import { StaveNote } from '../src/stavenote';
 
 const ChordSymbolTests = {
   Start(): void {
diff --git a/tests/curve_tests.ts b/tests/curve_tests.ts
index fa0f8d61e6..131ff877c5 100644
--- a/tests/curve_tests.ts
+++ b/tests/curve_tests.ts
@@ -5,10 +5,10 @@
 
 import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { CurvePosition } from 'curve';
-import { BuilderOptions } from 'easyscore';
-import { Factory } from 'factory';
-import { StaveNote } from 'stavenote';
+import { CurvePosition } from '../src/curve';
+import { BuilderOptions } from '../src/easyscore';
+import { Factory } from '../src/factory';
+import { StaveNote } from '../src/stavenote';
 
 const CurveTests = {
   Start(): void {
diff --git a/tests/dot_tests.ts b/tests/dot_tests.ts
index 7e68eb0608..4e9c35c0fb 100644
--- a/tests/dot_tests.ts
+++ b/tests/dot_tests.ts
@@ -5,14 +5,14 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { ModifierContext } from 'modifiercontext';
-import { Note } from 'note';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote } from 'stavenote';
-import { TickContext } from 'tickcontext';
+import { Beam } from '../src/beam';
+import { ModifierContext } from '../src/modifiercontext';
+import { Note } from '../src/note';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote } from '../src/stavenote';
+import { TickContext } from '../src/tickcontext';
 
 const DotTests = {
   Start(): void {
diff --git a/tests/easyscore_tests.ts b/tests/easyscore_tests.ts
index fee2e1bdbe..75e52e8912 100644
--- a/tests/easyscore_tests.ts
+++ b/tests/easyscore_tests.ts
@@ -5,13 +5,13 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Articulation } from 'articulation';
-import { EasyScore } from 'easyscore';
-import { FretHandFinger } from 'frethandfinger';
-import { Modifier } from 'modifier';
-import { StaveConnector } from 'staveconnector';
-import { Stem } from 'stem';
-import { Tuplet } from 'tuplet';
+import { Articulation } from '../src/articulation';
+import { EasyScore } from '../src/easyscore';
+import { FretHandFinger } from '../src/frethandfinger';
+import { Modifier } from '../src/modifier';
+import { StaveConnector } from '../src/staveconnector';
+import { Stem } from '../src/stem';
+import { Tuplet } from '../src/tuplet';
 
 const EasyScoreTests = {
   Start(): void {
diff --git a/tests/factory_tests.ts b/tests/factory_tests.ts
index 51f32b0cd6..93413dbc88 100644
--- a/tests/factory_tests.ts
+++ b/tests/factory_tests.ts
@@ -5,8 +5,8 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Factory } from 'factory';
-import { Barline } from 'stavebarline';
+import { Factory } from '../src/factory';
+import { Barline } from '../src/stavebarline';
 
 const FactoryTests = {
   Start(): void {
diff --git a/tests/formatter_tests.ts b/tests/formatter_tests.ts
index bfef469fee..d8f37b53ad 100644
--- a/tests/formatter_tests.ts
+++ b/tests/formatter_tests.ts
@@ -5,21 +5,18 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Annotation } from 'annotation';
-import { Beam } from 'beam';
-import { Bend } from 'bend';
-import { Flow } from 'flow';
-import { Font, FontGlyph } from 'font';
-// import { FontGlyph, FontWeight } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { Note } from 'note';
-import { Registry } from 'registry';
-import { Stave } from 'stave';
-import { StaveConnector } from 'staveconnector';
-import { StaveNote } from 'stavenote';
-import { Tables } from 'tables';
-import { Voice, VoiceTime } from 'voice';
-
+import { Annotation } from '../src/annotation';
+import { Beam } from '../src/beam';
+import { Bend } from '../src/bend';
+import { Flow } from '../src/flow';
+import { Font, FontGlyph } from '../src/font';
+import { Formatter } from '../src/formatter';
+import { Note } from '../src/note';
+import { Registry } from '../src/registry';
+import { Stave } from '../src/stave';
+import { StaveConnector } from '../src/staveconnector';
+import { StaveNote } from '../src/stavenote';
+import { Voice, VoiceTime } from '../src/voice';
 import { MockTickable } from './mocks';
 
 const FormatterTests = {
@@ -59,8 +56,8 @@ function glyphWidth(glyphName: string): number {
   //   NOTATION_FONT_SCALE: 39,
   //   TABLATURE_FONT_SCALE: 39,
 
-  const glyph: FontGlyph = Tables.currentMusicFont().getGlyphs()[glyphName];
-  const widthInEm = (glyph.x_max - glyph.x_min) / Tables.currentMusicFont().getResolution();
+  const glyph: FontGlyph = Flow.currentMusicFont().getGlyphs()[glyphName];
+  const widthInEm = (glyph.x_max - glyph.x_min) / Flow.currentMusicFont().getResolution();
   return widthInEm * 38 * Font.convertToPxFrom.pt;
 }
 
diff --git a/tests/fraction_tests.ts b/tests/fraction_tests.ts
index 2f895b790b..2517fc6a42 100644
--- a/tests/fraction_tests.ts
+++ b/tests/fraction_tests.ts
@@ -3,7 +3,7 @@
 //
 // Fraction Tests
 
-import { Fraction } from 'fraction';
+import { Fraction } from '../src/fraction';
 
 const FractionTests = {
   Start(): void {
diff --git a/tests/ghostnote_tests.ts b/tests/ghostnote_tests.ts
index 1f11732ef4..1c0ef7ab06 100644
--- a/tests/ghostnote_tests.ts
+++ b/tests/ghostnote_tests.ts
@@ -5,10 +5,10 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { EasyScore } from 'easyscore';
-import { Factory } from 'factory';
-import { StaveNote } from 'stavenote';
-import { StemmableNote } from 'stemmablenote';
+import { EasyScore } from '../src/easyscore';
+import { Factory } from '../src/factory';
+import { StaveNote } from '../src/stavenote';
+import { StemmableNote } from '../src/stemmablenote';
 
 const GhostNoteTests = {
   Start(): void {
diff --git a/tests/glyphnote_tests.ts b/tests/glyphnote_tests.ts
index abd0334ef8..fa9f069074 100644
--- a/tests/glyphnote_tests.ts
+++ b/tests/glyphnote_tests.ts
@@ -5,12 +5,12 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { ChordSymbol } from 'chordsymbol';
-import { Glyph } from 'glyph';
-import { Note } from 'note';
-import { Registry } from 'registry';
-import { StaveConnector } from 'staveconnector';
-import { Voice } from 'voice';
+import { ChordSymbol } from '../src/chordsymbol';
+import { Glyph } from '../src/glyph';
+import { Note } from '../src/note';
+import { Registry } from '../src/registry';
+import { StaveConnector } from '../src/staveconnector';
+import { Voice } from '../src/voice';
 
 const GlyphNoteTests = {
   Start(): void {
diff --git a/tests/gracenote_tests.ts b/tests/gracenote_tests.ts
index 6a539cf697..300d5999d3 100644
--- a/tests/gracenote_tests.ts
+++ b/tests/gracenote_tests.ts
@@ -7,11 +7,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { Factory } from 'factory';
-import { Formatter } from 'formatter';
-import { GraceNote, GraceNoteStruct } from 'gracenote';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
+import { Beam } from '../src/beam';
+import { Factory } from '../src/factory';
+import { Formatter } from '../src/formatter';
+import { GraceNote, GraceNoteStruct } from '../src/gracenote';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
 
 const GraceNoteTests = {
   Start(): void {
diff --git a/tests/gracetabnote_tests.ts b/tests/gracetabnote_tests.ts
index 490912e1a4..165a41f512 100644
--- a/tests/gracetabnote_tests.ts
+++ b/tests/gracetabnote_tests.ts
@@ -5,15 +5,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { GraceNoteGroup } from 'gracenotegroup';
-import { GraceTabNote } from 'gracetabnote';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { Voice } from 'voice';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { GraceNoteGroup } from '../src/gracenotegroup';
+import { GraceTabNote } from '../src/gracetabnote';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { Voice } from '../src/voice';
 
 const GraceTabNoteTests = {
   Start(): void {
diff --git a/tests/key_clef_tests.ts b/tests/key_clef_tests.ts
index 1e31ce29f4..0c2883b474 100644
--- a/tests/key_clef_tests.ts
+++ b/tests/key_clef_tests.ts
@@ -6,10 +6,10 @@
 
 import { MAJOR_KEYS, MINOR_KEYS, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Glyph } from 'glyph';
-import { KeySignature } from 'keysignature';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
+import { Glyph } from '../src/glyph';
+import { KeySignature } from '../src/keysignature';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
 
 const ClefKeySignatureTests = {
   Start(): void {
diff --git a/tests/keymanager_tests.ts b/tests/keymanager_tests.ts
index c372c4385d..7b82ee741a 100644
--- a/tests/keymanager_tests.ts
+++ b/tests/keymanager_tests.ts
@@ -6,7 +6,7 @@
 // TODO: KeyManager.getAccidental(key) specifies that the return value's .accidental property is string | undefined.
 //       However, we check it against null.
 
-import { KeyManager } from 'keymanager';
+import { KeyManager } from '../src/keymanager';
 
 const KeyManagerTests = {
   Start(): void {
diff --git a/tests/keysignature_tests.ts b/tests/keysignature_tests.ts
index 45b40efca8..440c03f9ea 100644
--- a/tests/keysignature_tests.ts
+++ b/tests/keysignature_tests.ts
@@ -6,12 +6,12 @@
 
 import { MAJOR_KEYS, MINOR_KEYS, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Glyph } from 'glyph';
-import { KeySignature } from 'keysignature';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { BarlineType } from 'stavebarline';
+import { Flow } from '../src/flow';
+import { Glyph } from '../src/glyph';
+import { KeySignature } from '../src/keysignature';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { BarlineType } from '../src/stavebarline';
 
 const KeySignatureTests = {
   Start(): void {
diff --git a/tests/mocks.ts b/tests/mocks.ts
index 5eed707510..1b89153377 100644
--- a/tests/mocks.ts
+++ b/tests/mocks.ts
@@ -3,12 +3,12 @@
 //
 // TickContext Mocks
 
-import { Fraction } from 'fraction';
-import { NoteMetrics } from 'note';
-import { Stave } from 'stave';
-import { Tickable } from 'tickable';
-import { TickContext } from 'tickcontext';
-import { Voice } from 'voice';
+import { Fraction } from '../src/fraction';
+import { NoteMetrics } from '../src/note';
+import { Stave } from '../src/stave';
+import { Tickable } from '../src/tickable';
+import { TickContext } from '../src/tickcontext';
+import { Voice } from '../src/voice';
 
 class MockTickable extends Tickable {
   tickContext?: TickContext;
diff --git a/tests/modifier_tests.ts b/tests/modifier_tests.ts
index f5c4585eba..6a11e4f858 100644
--- a/tests/modifier_tests.ts
+++ b/tests/modifier_tests.ts
@@ -3,8 +3,8 @@
 //
 // ModifierContext Tests
 
-import { Modifier } from 'modifier';
-import { ModifierContext } from 'modifiercontext';
+import { Modifier } from '../src/modifier';
+import { ModifierContext } from '../src/modifiercontext';
 
 const ModifierContextTests = {
   Start(): void {
diff --git a/tests/multimeasurerest_tests.ts b/tests/multimeasurerest_tests.ts
index 093ca6f327..0d340f45c4 100644
--- a/tests/multimeasurerest_tests.ts
+++ b/tests/multimeasurerest_tests.ts
@@ -5,9 +5,8 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-// import { Font } from 'font'; // RONYEH
-import { MultimeasureRestRenderOptions } from 'multimeasurerest';
+import { Flow } from '../src/flow';
+import { MultimeasureRestRenderOptions } from '../src/multimeasurerest';
 
 const MultiMeasureRestTests = {
   Start(): void {
diff --git a/tests/music_tests.ts b/tests/music_tests.ts
index b13aa7c332..5dafac8084 100644
--- a/tests/music_tests.ts
+++ b/tests/music_tests.ts
@@ -3,8 +3,8 @@
 //
 // Music Tests
 
-import { KeyManager } from 'keymanager';
-import { Music } from 'music';
+import { KeyManager } from '../src/keymanager';
+import { Music } from '../src/music';
 
 const MusicTests = {
   Start(): void {
diff --git a/tests/notehead_tests.ts b/tests/notehead_tests.ts
index 16649ec08c..53aeefe62f 100644
--- a/tests/notehead_tests.ts
+++ b/tests/notehead_tests.ts
@@ -12,15 +12,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { NoteHead } from 'notehead';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { TickContext } from 'tickcontext';
-import { Voice } from 'voice';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { NoteHead } from '../src/notehead';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { TickContext } from '../src/tickcontext';
+import { Voice } from '../src/voice';
 
 const NoteHeadTests = {
   Start(): void {
diff --git a/tests/notesubgroup_tests.ts b/tests/notesubgroup_tests.ts
index 03cb5938c4..1a2d89a388 100644
--- a/tests/notesubgroup_tests.ts
+++ b/tests/notesubgroup_tests.ts
@@ -6,11 +6,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { BarNote } from 'barnote';
-import { Factory } from 'factory';
-import { Note } from 'note';
-import { BarlineType } from 'stavebarline';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
+import { BarNote } from '../src/barnote';
+import { Factory } from '../src/factory';
+import { Note } from '../src/note';
+import { BarlineType } from '../src/stavebarline';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
 
 const NoteSubGroupTests = {
   Start(): void {
diff --git a/tests/ornament_tests.ts b/tests/ornament_tests.ts
index e7d3504409..19270106c4 100644
--- a/tests/ornament_tests.ts
+++ b/tests/ornament_tests.ts
@@ -8,15 +8,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Accidental } from 'accidental';
-import { Beam } from 'beam';
-import { Formatter } from 'formatter';
-import { Glyph } from 'glyph';
-import { Ornament } from 'ornament';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote } from 'stavenote';
-import { Voice, VoiceMode } from 'voice';
+import { Accidental } from '../src/accidental';
+import { Beam } from '../src/beam';
+import { Formatter } from '../src/formatter';
+import { Glyph } from '../src/glyph';
+import { Ornament } from '../src/ornament';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote } from '../src/stavenote';
+import { Voice, VoiceMode } from '../src/voice';
 
 const OrnamentTests = {
   Start(): void {
diff --git a/tests/parser_tests.ts b/tests/parser_tests.ts
index 95a206b923..c373940bb3 100644
--- a/tests/parser_tests.ts
+++ b/tests/parser_tests.ts
@@ -3,7 +3,7 @@
 //
 // Parser Tests
 
-import { Grammar, Parser, Result, RuleFunction } from 'parser';
+import { Grammar, Parser, Result, RuleFunction } from '../src/parser';
 
 const ParserTests = {
   Start(): void {
diff --git a/tests/pedalmarking_tests.ts b/tests/pedalmarking_tests.ts
index e53c3cff9d..8a8f8aa1f2 100644
--- a/tests/pedalmarking_tests.ts
+++ b/tests/pedalmarking_tests.ts
@@ -7,9 +7,9 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Factory } from 'factory';
-import { StaveNote } from 'stavenote';
-import { Tickable } from 'tickable';
+import { Factory } from '../src/factory';
+import { StaveNote } from '../src/stavenote';
+import { Tickable } from '../src/tickable';
 
 const PedalMarkingTests = {
   Start(): void {
diff --git a/tests/percussion_tests.ts b/tests/percussion_tests.ts
index 2bc95cfb12..8eca667962 100644
--- a/tests/percussion_tests.ts
+++ b/tests/percussion_tests.ts
@@ -8,14 +8,14 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Factory } from 'factory';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { StemmableNote } from 'stemmablenote';
-import { TickContext } from 'tickcontext';
-import { Tremolo } from 'tremolo';
+import { Factory } from '../src/factory';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { StemmableNote } from '../src/stemmablenote';
+import { TickContext } from '../src/tickcontext';
+import { Tremolo } from '../src/tremolo';
 
 const PercussionTests = {
   Start(): void {
diff --git a/tests/registry_tests.ts b/tests/registry_tests.ts
index 096b5dcbb5..e70c16dbde 100644
--- a/tests/registry_tests.ts
+++ b/tests/registry_tests.ts
@@ -3,11 +3,11 @@
 //
 // Registry Tests
 
-import { EasyScore } from 'easyscore';
-import { Element } from 'element';
-import { Factory } from 'factory';
-import { Registry } from 'registry';
-import { StaveNote } from 'stavenote';
+import { EasyScore } from '../src/easyscore';
+import { Element } from '../src/element';
+import { Factory } from '../src/factory';
+import { Registry } from '../src/registry';
+import { StaveNote } from '../src/stavenote';
 
 const RegistryTests = {
   Start(): void {
diff --git a/tests/renderer_tests.ts b/tests/renderer_tests.ts
index 17843516fb..ba97b088e3 100644
--- a/tests/renderer_tests.ts
+++ b/tests/renderer_tests.ts
@@ -6,15 +6,14 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { CanvasContext } from 'canvascontext';
-import { Factory, FactoryOptions } from 'factory';
-import { Formatter } from 'formatter';
-import { RenderContext } from 'rendercontext';
-import { Renderer } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote } from 'stavenote';
-import { SVGContext } from 'svgcontext';
-
+import { CanvasContext } from '../src/canvascontext';
+import { Factory, FactoryOptions } from '../src/factory';
+import { Formatter } from '../src/formatter';
+import { RenderContext } from '../src/rendercontext';
+import { Renderer } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote } from '../src/stavenote';
+import { SVGContext } from '../src/svgcontext';
 import { RuntimeError } from '../src/util';
 
 // TODO: Should FactoryOptions.renderer.elementId also accept a canvas | div?
diff --git a/tests/rests_tests.ts b/tests/rests_tests.ts
index 46845cba06..a8898c3039 100644
--- a/tests/rests_tests.ts
+++ b/tests/rests_tests.ts
@@ -5,15 +5,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { Tuplet } from 'tuplet';
-import { Voice } from 'voice';
+import { Beam } from '../src/beam';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { Tuplet } from '../src/tuplet';
+import { Voice } from '../src/voice';
 
 const RestsTests = {
   Start(): void {
diff --git a/tests/rhythm_tests.ts b/tests/rhythm_tests.ts
index 40459a98b2..c8e2539a79 100644
--- a/tests/rhythm_tests.ts
+++ b/tests/rhythm_tests.ts
@@ -5,13 +5,13 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Annotation } from 'annotation';
-import { Beam } from 'beam';
-import { Formatter } from 'formatter';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { BarlineType } from 'stavebarline';
-import { StaveNote } from 'stavenote';
+import { Annotation } from '../src/annotation';
+import { Beam } from '../src/beam';
+import { Formatter } from '../src/formatter';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { BarlineType } from '../src/stavebarline';
+import { StaveNote } from '../src/stavenote';
 
 const RhythmTests = {
   Start(): void {
diff --git a/tests/stave_tests.ts b/tests/stave_tests.ts
index ffa4bc3d62..47b8863f03 100644
--- a/tests/stave_tests.ts
+++ b/tests/stave_tests.ts
@@ -8,22 +8,22 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Accidental } from 'accidental';
-import { Beam } from 'beam';
-import { Clef } from 'clef';
-import { Formatter } from 'formatter';
-import { KeySignature } from 'keysignature';
-import { Modifier } from 'modifier';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { Barline, BarlineType } from 'stavebarline';
-import { StaveModifier } from 'stavemodifier';
-import { StaveNote } from 'stavenote';
-import { Repetition } from 'staverepetition';
-import { StaveTempoOptions } from 'stavetempo';
-import { VoltaType } from 'stavevolta';
-import { Justification } from 'textnote';
-import { TimeSignature } from 'timesignature';
+import { Accidental } from '../src/accidental';
+import { Beam } from '../src/beam';
+import { Clef } from '../src/clef';
+import { Formatter } from '../src/formatter';
+import { KeySignature } from '../src/keysignature';
+import { Modifier } from '../src/modifier';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { Barline, BarlineType } from '../src/stavebarline';
+import { StaveModifier } from '../src/stavemodifier';
+import { StaveNote } from '../src/stavenote';
+import { Repetition } from '../src/staverepetition';
+import { StaveTempoOptions } from '../src/stavetempo';
+import { VoltaType } from '../src/stavevolta';
+import { Justification } from '../src/textnote';
+import { TimeSignature } from '../src/timesignature';
 
 const StaveTests = {
   Start(): void {
diff --git a/tests/staveconnector_tests.ts b/tests/staveconnector_tests.ts
index 6fac6fb639..20abd2c2bf 100644
--- a/tests/staveconnector_tests.ts
+++ b/tests/staveconnector_tests.ts
@@ -7,12 +7,12 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Modifier } from 'modifier';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { BarlineType } from 'stavebarline';
-import { StaveConnector } from 'staveconnector';
+import { Flow } from '../src/flow';
+import { Modifier } from '../src/modifier';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { BarlineType } from '../src/stavebarline';
+import { StaveConnector } from '../src/staveconnector';
 
 const StaveConnectorTests = {
   Start(): void {
diff --git a/tests/stavehairpin_tests.ts b/tests/stavehairpin_tests.ts
index c9cab270a6..fba919c481 100644
--- a/tests/stavehairpin_tests.ts
+++ b/tests/stavehairpin_tests.ts
@@ -8,9 +8,9 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { RenderContext } from 'rendercontext';
-import { StaveHairpin, StaveHairpinRenderOptions } from 'stavehairpin';
-import { StaveNote } from 'stavenote';
+import { RenderContext } from '../src/rendercontext';
+import { StaveHairpin, StaveHairpinRenderOptions } from '../src/stavehairpin';
+import { StaveNote } from '../src/stavenote';
 
 const StaveHairpinTests = {
   Start(): void {
diff --git a/tests/stavemodifier_tests.ts b/tests/stavemodifier_tests.ts
index 2dce9bba51..f0c80d8da3 100644
--- a/tests/stavemodifier_tests.ts
+++ b/tests/stavemodifier_tests.ts
@@ -5,10 +5,10 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { BarlineType } from 'stavebarline';
-import { StaveModifierPosition } from 'stavemodifier';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { BarlineType } from '../src/stavebarline';
+import { StaveModifierPosition } from '../src/stavemodifier';
 
 const StaveModifierTests = {
   Start(): void {
diff --git a/tests/stavenote_tests.ts b/tests/stavenote_tests.ts
index 419ef579a3..a14137512e 100644
--- a/tests/stavenote_tests.ts
+++ b/tests/stavenote_tests.ts
@@ -8,24 +8,24 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Accidental } from 'accidental';
-import { Annotation } from 'annotation';
-import { Articulation } from 'articulation';
-import { Beam } from 'beam';
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { Fraction } from 'fraction';
-import { FretHandFinger } from 'frethandfinger';
-import { Modifier, ModifierPosition } from 'modifier';
-import { ModifierContext } from 'modifiercontext';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { StaveNote, StaveNoteStruct } from 'stavenote';
-import { Stem } from 'stem';
-import { StringNumber } from 'stringnumber';
-import { Stroke } from 'strokes';
-import { TickContext } from 'tickcontext';
+import { Accidental } from '../src/accidental';
+import { Annotation } from '../src/annotation';
+import { Articulation } from '../src/articulation';
+import { Beam } from '../src/beam';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { Fraction } from '../src/fraction';
+import { FretHandFinger } from '../src/frethandfinger';
+import { Modifier, ModifierPosition } from '../src/modifier';
+import { ModifierContext } from '../src/modifiercontext';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { StaveNote, StaveNoteStruct } from '../src/stavenote';
+import { Stem } from '../src/stem';
+import { StringNumber } from '../src/stringnumber';
+import { Stroke } from '../src/strokes';
+import { TickContext } from '../src/tickcontext';
 
 const StaveNoteTests = {
   Start(): void {
diff --git a/tests/stavetie_tests.ts b/tests/stavetie_tests.ts
index 53635ebe5e..6296acdef4 100644
--- a/tests/stavetie_tests.ts
+++ b/tests/stavetie_tests.ts
@@ -5,11 +5,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { BuilderOptions } from 'easyscore';
-import { Factory } from 'factory';
-import { Stave } from 'stave';
-import { StaveNote } from 'stavenote';
-import { Stem } from 'stem';
+import { BuilderOptions } from '../src/easyscore';
+import { Factory } from '../src/factory';
+import { Stave } from '../src/stave';
+import { StaveNote } from '../src/stavenote';
+import { Stem } from '../src/stem';
 
 const StaveTieTests = {
   Start(): void {
diff --git a/tests/stringnumber_tests.ts b/tests/stringnumber_tests.ts
index 27ac3bcc1f..923c526df4 100644
--- a/tests/stringnumber_tests.ts
+++ b/tests/stringnumber_tests.ts
@@ -5,11 +5,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Glyph } from 'glyph';
-import { Renderer } from 'renderer';
-import { Stave } from 'stave';
-import { BarlineType } from 'stavebarline';
-import { Stroke } from 'strokes';
+import { Glyph } from '../src/glyph';
+import { Renderer } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { BarlineType } from '../src/stavebarline';
+import { Stroke } from '../src/strokes';
 
 const StringNumberTests = {
   Start(): void {
diff --git a/tests/strokes_tests.ts b/tests/strokes_tests.ts
index ab2b80cec8..e702c7997e 100644
--- a/tests/strokes_tests.ts
+++ b/tests/strokes_tests.ts
@@ -5,11 +5,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { Bend } from 'bend';
-import { GraceNote, GraceNoteStruct } from 'gracenote';
-import { Barline } from 'stavebarline';
-import { Stroke } from 'strokes';
+import { Beam } from '../src/beam';
+import { Bend } from '../src/bend';
+import { GraceNote, GraceNoteStruct } from '../src/gracenote';
+import { Barline } from '../src/stavebarline';
+import { Stroke } from '../src/strokes';
 
 const StrokesTests = {
   Start(): void {
diff --git a/tests/style_tests.ts b/tests/style_tests.ts
index 66c4e3f68f..f628e379dd 100644
--- a/tests/style_tests.ts
+++ b/tests/style_tests.ts
@@ -11,21 +11,21 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Annotation } from 'annotation';
-import { Articulation } from 'articulation';
-import { Bend } from 'bend';
-import { ElementStyle } from 'element';
-import { Formatter } from 'formatter';
-import { KeySignature } from 'keysignature';
-import { NoteSubGroup } from 'notesubgroup';
-import { Ornament } from 'ornament';
-import { ContextBuilder } from 'renderer';
-import { StaveModifierPosition } from 'stavemodifier';
-import { StaveNote } from 'stavenote';
-import { Stroke } from 'strokes';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { TimeSignature } from 'timesignature';
+import { Annotation } from '../src/annotation';
+import { Articulation } from '../src/articulation';
+import { Bend } from '../src/bend';
+import { ElementStyle } from '../src/element';
+import { Formatter } from '../src/formatter';
+import { KeySignature } from '../src/keysignature';
+import { NoteSubGroup } from '../src/notesubgroup';
+import { Ornament } from '../src/ornament';
+import { ContextBuilder } from '../src/renderer';
+import { StaveModifierPosition } from '../src/stavemodifier';
+import { StaveNote } from '../src/stavenote';
+import { Stroke } from '../src/strokes';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { TimeSignature } from '../src/timesignature';
 
 const StyleTests = {
   Start(): void {
@@ -112,8 +112,7 @@ function tab(options: TestOptions, contextBuilder: ContextBuilder): void {
   const ctx = contextBuilder(options.elementId, 500, 140);
   ctx.fillStyle = '#221';
   ctx.strokeStyle = '#221';
-  ctx.font = ' 10pt Arial';
-  // ctx.font = '10pt Arial'; // RONYEH
+  ctx.font = '10pt Arial';
   const stave = new TabStave(10, 10, 450).addTabGlyph();
   stave.getModifiers()[2].setStyle(FS('blue'));
   stave.setContext(ctx).draw();
diff --git a/tests/tabnote_tests.ts b/tests/tabnote_tests.ts
index ca2ef04087..5612f052c3 100644
--- a/tests/tabnote_tests.ts
+++ b/tests/tabnote_tests.ts
@@ -5,16 +5,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-// import { Font, FontWeight } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { TickContext } from 'tickcontext';
-import { Voice, VoiceMode } from 'voice';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { TickContext } from '../src/tickcontext';
+import { Voice, VoiceMode } from '../src/voice';
 
 const TabNoteTests = {
   Start(): void {
diff --git a/tests/tabslide_tests.ts b/tests/tabslide_tests.ts
index 99c4469ea8..461abe403a 100644
--- a/tests/tabslide_tests.ts
+++ b/tests/tabslide_tests.ts
@@ -5,15 +5,15 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { TieNotes } from 'stavetie';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabSlide } from 'tabslide';
-import { TabStave } from 'tabstave';
-import { Voice } from 'voice';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { TieNotes } from '../src/stavetie';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabSlide } from '../src/tabslide';
+import { TabStave } from '../src/tabstave';
+import { Voice } from '../src/voice';
 
 const TabSlideTests = {
   Start(): void {
diff --git a/tests/tabstave_tests.ts b/tests/tabstave_tests.ts
index 81946af5fd..e12a8998b0 100644
--- a/tests/tabstave_tests.ts
+++ b/tests/tabstave_tests.ts
@@ -5,8 +5,8 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { ContextBuilder } from 'renderer';
-import { TabStave } from 'tabstave';
+import { ContextBuilder } from '../src/renderer';
+import { TabStave } from '../src/tabstave';
 
 const TabStaveTests = {
   Start(): void {
diff --git a/tests/tabtie_tests.ts b/tests/tabtie_tests.ts
index d6b6feb484..02be700f4b 100644
--- a/tests/tabtie_tests.ts
+++ b/tests/tabtie_tests.ts
@@ -5,18 +5,18 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Annotation } from 'annotation';
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { Note } from 'note';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { TieNotes } from 'stavetie';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { TabTie } from 'tabtie';
-import { Voice } from 'voice';
+import { Annotation } from '../src/annotation';
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { Note } from '../src/note';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { TieNotes } from '../src/stavetie';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { TabTie } from '../src/tabtie';
+import { Voice } from '../src/voice';
 
 const TabTieTests = {
   Start(): void {
diff --git a/tests/textnote_tests.ts b/tests/textnote_tests.ts
index f4c66bd57b..bd8b8b8eb2 100644
--- a/tests/textnote_tests.ts
+++ b/tests/textnote_tests.ts
@@ -5,12 +5,11 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Crescendo } from 'crescendo';
-import { Flow } from 'flow';
-// import { Font } from 'font'; // RONYEH
-import { Note } from 'note';
-import { Stave } from 'stave';
-import { TextNote } from 'textnote';
+import { Crescendo } from '../src/crescendo';
+import { Flow } from '../src/flow';
+import { Note } from '../src/note';
+import { Stave } from '../src/stave';
+import { TextNote } from '../src/textnote';
 
 const TextNoteTests = {
   Start(): void {
@@ -140,7 +139,7 @@ function superscriptAndSubscript(options: TestOptions): void {
     const textNote = note as TextNote;
     // textNote.font = { family: 'Serif', size: 15, weight: '' }; // 3.0.9 API was not consistent. Usually .font is a string.
     textNote.setFont({ family: 'Serif', size: 15 }); // In 4.0.0, use setFont(fontInfo) instead.
-    // textNote.setFont({ family: Font.SERIF, size: 15 }); // RONYEH
+    // textNote.setFont({ family: Font.SERIF, size: 15 }); // RONYEH Instead of specifying 'Serif', you can use the constant.
     textNote.setLine(13);
     textNote.setJustification(TextNote.Justification.LEFT);
   });
diff --git a/tests/threevoice_tests.ts b/tests/threevoice_tests.ts
index 4d2b0b6749..d4ab457764 100644
--- a/tests/threevoice_tests.ts
+++ b/tests/threevoice_tests.ts
@@ -5,11 +5,11 @@
 
 import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Beam } from 'beam';
-import { BuilderOptions } from 'easyscore';
-import { Factory } from 'factory';
-import { Note } from 'note';
-import { Voice } from 'voice';
+import { Beam } from '../src/beam';
+import { BuilderOptions } from '../src/easyscore';
+import { Factory } from '../src/factory';
+import { Note } from '../src/note';
+import { Voice } from '../src/voice';
 
 const ThreeVoicesTests = {
   Start(): void {
diff --git a/tests/tickcontext_tests.ts b/tests/tickcontext_tests.ts
index 8fd9c3ede0..49eafccb34 100644
--- a/tests/tickcontext_tests.ts
+++ b/tests/tickcontext_tests.ts
@@ -3,9 +3,8 @@
 //
 // TickContext Tests
 
-import { Flow } from 'flow';
-import { TickContext } from 'tickcontext';
-
+import { Flow } from '../src/flow';
+import { TickContext } from '../src/tickcontext';
 import { MockTickable } from './mocks';
 
 const TickContextTests = {
diff --git a/tests/timesignature_tests.ts b/tests/timesignature_tests.ts
index 47d45952c1..400c22fb51 100644
--- a/tests/timesignature_tests.ts
+++ b/tests/timesignature_tests.ts
@@ -5,10 +5,10 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { ContextBuilder } from 'renderer';
-import { Stave, StaveLineConfig } from 'stave';
-import { StaveConnector } from 'staveconnector';
-import { TimeSignature } from 'timesignature';
+import { ContextBuilder } from '../src/renderer';
+import { Stave, StaveLineConfig } from '../src/stave';
+import { StaveConnector } from '../src/staveconnector';
+import { TimeSignature } from '../src/timesignature';
 
 const TimeSignatureTests = {
   Start(): void {
diff --git a/tests/tremolo_tests.ts b/tests/tremolo_tests.ts
index 45715ec630..de3671d3c0 100644
--- a/tests/tremolo_tests.ts
+++ b/tests/tremolo_tests.ts
@@ -5,8 +5,8 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Barline } from 'stavebarline';
-import { Tremolo } from 'tremolo';
+import { Barline } from '../src/stavebarline';
+import { Tremolo } from '../src/tremolo';
 
 const TremoloTests = {
   Start(): void {
diff --git a/tests/tuning_tests.ts b/tests/tuning_tests.ts
index 8aeff95c30..314212f52f 100644
--- a/tests/tuning_tests.ts
+++ b/tests/tuning_tests.ts
@@ -3,7 +3,7 @@
 //
 // Tuning Tests
 
-import { Tuning } from 'tuning';
+import { Tuning } from '../src/tuning';
 
 const TuningTests = {
   Start(): void {
diff --git a/tests/tuplet_tests.ts b/tests/tuplet_tests.ts
index fb98917b6a..a0b3ab9f8c 100644
--- a/tests/tuplet_tests.ts
+++ b/tests/tuplet_tests.ts
@@ -5,9 +5,9 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Formatter } from 'formatter';
-import { Stem } from 'stem';
-import { Tuplet } from 'tuplet';
+import { Formatter } from '../src/formatter';
+import { Stem } from '../src/stem';
+import { Tuplet } from '../src/tuplet';
 
 const TupletTests = {
   Start(): void {
diff --git a/tests/typeguard_tests.ts b/tests/typeguard_tests.ts
index 98a0a4dbae..79b60da41c 100644
--- a/tests/typeguard_tests.ts
+++ b/tests/typeguard_tests.ts
@@ -7,10 +7,10 @@
 // eslint-disable-next-line
 // @ts-nocheck to support ES5 style class declaration in the fakeES5() test case.
 
-import { StaveNote } from 'stavenote';
-import { StemmableNote } from 'stemmablenote';
-import { TabNote } from 'tabnote';
-import { isCategory, isNote, isStaveNote, isStemmableNote, isTabNote } from 'typeguard';
+import { StaveNote } from '../src/stavenote';
+import { StemmableNote } from '../src/stemmablenote';
+import { TabNote } from '../src/tabnote';
+import { isCategory, isNote, isStaveNote, isStemmableNote, isTabNote } from '../src/typeguard';
 
 const TypeGuardTests = {
   Start(): void {
diff --git a/tests/vexflow_test_helpers.ts b/tests/vexflow_test_helpers.ts
index 73150ea3c3..52c30105d4 100644
--- a/tests/vexflow_test_helpers.ts
+++ b/tests/vexflow_test_helpers.ts
@@ -3,12 +3,11 @@
 //
 // VexFlow Test Support Library
 
-import { Factory } from 'factory';
-import { Flow } from 'flow';
-import { Font } from 'font';
-import { RenderContext } from 'rendercontext';
-import { ContextBuilder, Renderer } from 'renderer';
-
+import { Factory } from '../src/factory';
+import { Flow } from '../src/flow';
+import { Font } from '../src/font';
+import { RenderContext } from '../src/rendercontext';
+import { ContextBuilder, Renderer } from '../src/renderer';
 import { Assert } from './types/qunit';
 
 /* eslint-disable */
diff --git a/tests/vf_prefix_tests.ts b/tests/vf_prefix_tests.ts
index 66bd2a5739..1813fbf4ae 100644
--- a/tests/vf_prefix_tests.ts
+++ b/tests/vf_prefix_tests.ts
@@ -5,83 +5,83 @@
 //
 // VexFlow classes are available under the global Vex.Flow.* namespace.
 
-import { Accidental } from 'accidental';
-import { Annotation } from 'annotation';
-import { Articulation } from 'articulation';
-import { BarNote } from 'barnote';
-import { Beam } from 'beam';
-import { Bend } from 'bend';
-import { BoundingBox } from 'boundingbox';
-import { BoundingBoxComputation } from 'boundingboxcomputation';
-import { ChordSymbol } from 'chordsymbol';
-import { Clef } from 'clef';
-import { ClefNote } from 'clefnote';
-import { Crescendo } from 'crescendo';
-import { Curve } from 'curve';
-import { Dot } from 'dot';
-import { EasyScore } from 'easyscore';
-import { Element } from 'element';
-import { Factory } from 'factory';
-import { Flow } from 'flow';
-import { Font } from 'font';
-import { Formatter } from 'formatter';
-import { Fraction } from 'fraction';
-import { FretHandFinger } from 'frethandfinger';
-import { GhostNote } from 'ghostnote';
-import { Glyph } from 'glyph';
-import { GlyphNote } from 'glyphnote';
-import { GraceNote } from 'gracenote';
-import { GraceNoteGroup } from 'gracenotegroup';
-import { GraceTabNote } from 'gracetabnote';
-import { KeyManager } from 'keymanager';
-import { KeySignature } from 'keysignature';
-import { KeySigNote } from 'keysignote';
-import { Modifier } from 'modifier';
-import { ModifierContext } from 'modifiercontext';
-import { MultiMeasureRest } from 'multimeasurerest';
-import { Music } from 'music';
-import { Note } from 'note';
-import { NoteHead } from 'notehead';
-import { NoteSubGroup } from 'notesubgroup';
-import { Ornament } from 'ornament';
-import { Parser } from 'parser';
-import { PedalMarking } from 'pedalmarking';
-import { Registry } from 'registry';
-import { Renderer } from 'renderer';
-import { RepeatNote } from 'repeatnote';
-import { Stave } from 'stave';
-import { Barline } from 'stavebarline';
-import { StaveConnector } from 'staveconnector';
-import { StaveHairpin } from 'stavehairpin';
-import { StaveLine } from 'staveline';
-import { StaveModifier } from 'stavemodifier';
-import { StaveNote } from 'stavenote';
-import { Repetition } from 'staverepetition';
-import { StaveTempo } from 'stavetempo';
-import { StaveText } from 'stavetext';
-import { StaveTie } from 'stavetie';
-import { Volta } from 'stavevolta';
-import { Stem } from 'stem';
-import { StringNumber } from 'stringnumber';
-import { Stroke } from 'strokes';
-import { System } from 'system';
-import { TabNote } from 'tabnote';
-import { TabSlide } from 'tabslide';
-import { TabStave } from 'tabstave';
-import { TabTie } from 'tabtie';
-import { TextBracket } from 'textbracket';
-import { TextDynamics } from 'textdynamics';
-import { TextFormatter } from 'textformatter';
-import { TextNote } from 'textnote';
-import { TickContext } from 'tickcontext';
-import { TimeSignature } from 'timesignature';
-import { TimeSigNote } from 'timesignote';
-import { Tremolo } from 'tremolo';
-import { Tuning } from 'tuning';
-import { Tuplet } from 'tuplet';
-import { Vibrato } from 'vibrato';
-import { VibratoBracket } from 'vibratobracket';
-import { Voice } from 'voice';
+import { Accidental } from '../src/accidental';
+import { Annotation } from '../src/annotation';
+import { Articulation } from '../src/articulation';
+import { BarNote } from '../src/barnote';
+import { Beam } from '../src/beam';
+import { Bend } from '../src/bend';
+import { BoundingBox } from '../src/boundingbox';
+import { BoundingBoxComputation } from '../src/boundingboxcomputation';
+import { ChordSymbol } from '../src/chordsymbol';
+import { Clef } from '../src/clef';
+import { ClefNote } from '../src/clefnote';
+import { Crescendo } from '../src/crescendo';
+import { Curve } from '../src/curve';
+import { Dot } from '../src/dot';
+import { EasyScore } from '../src/easyscore';
+import { Element } from '../src/element';
+import { Factory } from '../src/factory';
+import { Flow } from '../src/flow';
+import { Font } from '../src/font';
+import { Formatter } from '../src/formatter';
+import { Fraction } from '../src/fraction';
+import { FretHandFinger } from '../src/frethandfinger';
+import { GhostNote } from '../src/ghostnote';
+import { Glyph } from '../src/glyph';
+import { GlyphNote } from '../src/glyphnote';
+import { GraceNote } from '../src/gracenote';
+import { GraceNoteGroup } from '../src/gracenotegroup';
+import { GraceTabNote } from '../src/gracetabnote';
+import { KeyManager } from '../src/keymanager';
+import { KeySignature } from '../src/keysignature';
+import { KeySigNote } from '../src/keysignote';
+import { Modifier } from '../src/modifier';
+import { ModifierContext } from '../src/modifiercontext';
+import { MultiMeasureRest } from '../src/multimeasurerest';
+import { Music } from '../src/music';
+import { Note } from '../src/note';
+import { NoteHead } from '../src/notehead';
+import { NoteSubGroup } from '../src/notesubgroup';
+import { Ornament } from '../src/ornament';
+import { Parser } from '../src/parser';
+import { PedalMarking } from '../src/pedalmarking';
+import { Registry } from '../src/registry';
+import { Renderer } from '../src/renderer';
+import { RepeatNote } from '../src/repeatnote';
+import { Stave } from '../src/stave';
+import { Barline } from '../src/stavebarline';
+import { StaveConnector } from '../src/staveconnector';
+import { StaveHairpin } from '../src/stavehairpin';
+import { StaveLine } from '../src/staveline';
+import { StaveModifier } from '../src/stavemodifier';
+import { StaveNote } from '../src/stavenote';
+import { Repetition } from '../src/staverepetition';
+import { StaveTempo } from '../src/stavetempo';
+import { StaveText } from '../src/stavetext';
+import { StaveTie } from '../src/stavetie';
+import { Volta } from '../src/stavevolta';
+import { Stem } from '../src/stem';
+import { StringNumber } from '../src/stringnumber';
+import { Stroke } from '../src/strokes';
+import { System } from '../src/system';
+import { TabNote } from '../src/tabnote';
+import { TabSlide } from '../src/tabslide';
+import { TabStave } from '../src/tabstave';
+import { TabTie } from '../src/tabtie';
+import { TextBracket } from '../src/textbracket';
+import { TextDynamics } from '../src/textdynamics';
+import { TextFormatter } from '../src/textformatter';
+import { TextNote } from '../src/textnote';
+import { TickContext } from '../src/tickcontext';
+import { TimeSignature } from '../src/timesignature';
+import { TimeSigNote } from '../src/timesignote';
+import { Tremolo } from '../src/tremolo';
+import { Tuning } from '../src/tuning';
+import { Tuplet } from '../src/tuplet';
+import { Vibrato } from '../src/vibrato';
+import { VibratoBracket } from '../src/vibratobracket';
+import { Voice } from '../src/voice';
 
 const VFPrefixTests = {
   Start(): void {
@@ -94,6 +94,8 @@ const VFPrefixTests = {
 declare let Vex: any;
 
 function VF_Prefix(): void {
+  // Intentionally use Vex.Flow here so we can verify that the Vex.Flow.* API
+  // is equivalent to using the individual classes in TypeScript.
   const VF = Vex.Flow as unknown as typeof Flow;
   equal(Accidental, VF.Accidental);
   equal(Annotation, VF.Annotation);
diff --git a/tests/vibrato_tests.ts b/tests/vibrato_tests.ts
index 04fcaec34a..6d9fd5fbca 100644
--- a/tests/vibrato_tests.ts
+++ b/tests/vibrato_tests.ts
@@ -5,13 +5,12 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Bend } from 'bend';
-// import { Font } from 'font'; // RONYEH
-import { Formatter } from 'formatter';
-import { ContextBuilder } from 'renderer';
-import { TabNote, TabNoteStruct } from 'tabnote';
-import { TabStave } from 'tabstave';
-import { Vibrato } from 'vibrato';
+import { Bend } from '../src/bend';
+import { Formatter } from '../src/formatter';
+import { ContextBuilder } from '../src/renderer';
+import { TabNote, TabNoteStruct } from '../src/tabnote';
+import { TabStave } from '../src/tabstave';
+import { Vibrato } from '../src/vibrato';
 
 const VibratoTests = {
   Start(): void {
diff --git a/tests/vibratobracket_tests.ts b/tests/vibratobracket_tests.ts
index 559b4052e6..022c733250 100644
--- a/tests/vibratobracket_tests.ts
+++ b/tests/vibratobracket_tests.ts
@@ -8,9 +8,9 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Factory } from 'factory';
-import { Note } from 'note';
-import { Tickable } from 'tickable';
+import { Factory } from '../src/factory';
+import { Note } from '../src/note';
+import { Tickable } from '../src/tickable';
 
 const VibratoBracketTests = {
   Start(): void {
diff --git a/tests/voice_tests.ts b/tests/voice_tests.ts
index c9e33d9a5b..0cfc8cff64 100644
--- a/tests/voice_tests.ts
+++ b/tests/voice_tests.ts
@@ -5,14 +5,13 @@
 
 import { TestOptions, VexFlowTests } from './vexflow_test_helpers';
 
-import { Flow } from 'flow';
-import { Formatter } from 'formatter';
-import { ContextBuilder } from 'renderer';
-import { Stave } from 'stave';
-import { Barline } from 'stavebarline';
-import { StaveNote } from 'stavenote';
-import { Voice } from 'voice';
-
+import { Flow } from '../src/flow';
+import { Formatter } from '../src/formatter';
+import { ContextBuilder } from '../src/renderer';
+import { Stave } from '../src/stave';
+import { Barline } from '../src/stavebarline';
+import { StaveNote } from '../src/stavenote';
+import { Voice } from '../src/voice';
 import { MockTickable } from './mocks';
 
 const VoiceTests = {