Updated rest of code accordingly. First test