More tests working
fixed bug