Removed unnecessary functions from Unit Tests