Added tests (for real)