Merged with @blan4.
Added source file for tests.