Added tests. Last commit broke.