[mac]#125 Adds tests