continued implementing tests and raw