Additional tests + some missing functionality.