Fixed unit tests
Results are now strongly typed.