Adding tests. Not working yet.