fix BUG
Start writing working tests