Started adding some real unit tests
Can't use '$' as qualified generic separator because it can cause compiler issues, use '_' instead