Improved tests

(Bug still exists)