Added spacing for better readability.
Configured test case file.
Simplify constructor procedure.