Fix backwards compatibility and add few tests