Added test (nUnit) solution. Modified core.