removed inheritance, fixed tests