Added some test elements here and there and fixed bug.