new: dev: Adding more unit tests