Fix: extensions and added unit tests