Added test, fixed missing declarations