Complete API + Starting unit tests