Cleaning test a bit. Adding length check.