Made fundamental tests work