Added more tests. Also nicer ones.