added more tests, bufferloader class, track viewmodel