Added jUnit tests + some styling