Adding last unit tests