Modified, add unit tests