Unit Tests and Updates