Added sample tests etc.