Added few header based classes and tests for them