Updated current Unit Tests