Fixed and augmented Unit Tests