Fixed check
Start adding tests