Cleanup, tests

Made scrib fail gracefully.