[WIP] Adds Tests – Fixes #1