Tests and readme updated