Added more tests again. Last ones?