Finalize new implementation. Update and validate tests