[WIP] Adding test