Added tests (undone)