Adding Tests -- WIP