Add extra notes & test