added tests with custom struct as values
minor include fixes.
updated README