Added tests. YAY