- Clean up of the code. Fixed the error regarding the test executing twice.