Refactored tests
Removed NetBean project file