Tests updated/Some beautifications